Skip to content

[Binding/Sofa.Core] FIX Node iterators.#171

Merged
fredroy merged 2 commits intosofa-framework:masterfrom
CRIStAL-PADR:pr-add-contains-in-nodeiterator
Sep 16, 2021
Merged

[Binding/Sofa.Core] FIX Node iterators.#171
fredroy merged 2 commits intosofa-framework:masterfrom
CRIStAL-PADR:pr-add-contains-in-nodeiterator

Conversation

@damienmarchal
Copy link
Copy Markdown
Contributor

@damienmarchal damienmarchal commented Sep 10, 2021 •
edited
Loading

The actually implmentation of NodeIterator is broken.
Eg:

  • the __getitem__ by name was always returning a BaseObject whatever the iterable was on object, children or parents
  • the remove_at method was actually always deleting a Child whatever the iterable was on object, children or parents
    There is also no __contains__ operator which prevent to write pythonic
if "AAA" in node.objects:
   pass.

This PR:

  • fix the broken implementation on remove_at and __getitem__ by adding lambda functions allowing to implement per-type behavior.
  • add tests for the fixed features
  • implements the __contains__ method and dedicated tests.
  • update the corresponding docstring

DRAFTED CODE FROM THE CODE-REVIEW:

def createScene(root):
    # Python2 
    root.getObjects() # 
    root.getObject("Nom")
    
    # Python3 
    __iterator__
    for i in root.getObjects(): => list(root.getObjects())
        
    for object in root.objects:
            print(object.getName())

    
    if root.getObject("Toto") != None:
    
    if "Toto" in root.getObjects():



    for object in root.objects:
        print(object.getName())                # Lazy
    
    if "Toto" in root.objects:                 # Test d'inclusion en temps constant
        # => root.getObjec("Toto")    
        
    del "Toto" in root.objects:                # Remove    
    
    root.objects
    root.parents

    root.children

@damienmarchal
[SofaPython3] Add the contains operator to Node iterators.
1ce86be 
So we can now write:
def createScene(root):
	if "MyObject" in root.objects:
		pass
	if "MyChild" in root.children:
		pass
	if "MyParent" in root.parents:
		pass
@damienmarchal damienmarchal changed the title [SofaPython3] Add the contains operator to Node iterators. [SofaPython3] FIX Node iterators. Sep 10, 2021
@damienmarchal damienmarchal changed the title [SofaPython3] FIX Node iterators. [Binding/Sofa.Core] FIX Node iterators. Sep 15, 2021
@damienmarchal
[SofaPython3] FIX the NodeIterator.
8b399b9 
The actually implmentation of NodeIterator is broken.
Eg:
   - the __getitem__ by name was always returning a BaseObject whatever the iterable was on object, children or parents
   - the remove_at method was actually always deleting a Child whatever the iterable was on object, children or parents
There is also no __contains__ operator which prevent to write pythonic
if "AAA" in node.objects:
   pass.

This PR:
	- fix the broken implementation on remove_at and __getitem__ by adding lambda functions allowing to implement per-type behavior.
	- add tests for the fixed features
	- implements the __contains__ method and dedicated tests.
	- update the corresponding docstring

In this PR I also added
@damienmarchal damienmarchal force-pushed the pr-add-contains-in-nodeiterator branch from 555d316 to 8b399b9 Compare September 16, 2021 06:26
@fredroy fredroy merged commit 04f1489 into sofa-framework:master Sep 16, 2021
@guparan guparan added this to the v21.12 milestone Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

pr: clean-fix pr: new feature pr: status ready

Projects

None yet

Milestone

v21.12

Development

Successfully merging this pull request may close these issues.

3 participants

@damienmarchal @guparan @fredroy